diff --git a/.gitattributes b/.gitattributes index 74d22516ae8..22040e90278 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1815,6 +1815,7 @@ res/cardsfolder/c/charisma.txt -text res/cardsfolder/c/charm_peddler.txt -text res/cardsfolder/c/charmbreaker_devils.txt -text res/cardsfolder/c/charmed_griffin.txt svneol=native#text/plain +res/cardsfolder/c/charmed_pendant.txt -text res/cardsfolder/c/charnelhoard_wurm.txt svneol=native#text/plain res/cardsfolder/c/chartooth_cougar.txt svneol=native#text/plain res/cardsfolder/c/chasm_drake.txt svneol=native#text/plain diff --git a/res/cardsfolder/c/charmed_pendant.txt b/res/cardsfolder/c/charmed_pendant.txt new file mode 100644 index 00000000000..2d17fce0e7d --- /dev/null +++ b/res/cardsfolder/c/charmed_pendant.txt @@ -0,0 +1,15 @@ +Name:Charmed Pendant +ManaCost:4 +Types:Artifact +A:AB$ Mana | Cost$ T Mill<1> | Produced$ W | Amount$ ManaW | References$ ManaW | InstantSpeed$ True | SubAbility$ DBManaU | SpellDescription$ For each colored mana symbol in that card's mana cost, add one mana of that color to your mana pool. Activate this ability only any time you could cast an instant. +SVar:DBManaU:DB$ Mana | Produced$ U | Amount$ ManaU | References$ ManaU | SubAbility$ DBManaB +SVar:DBManaB:DB$ Mana | Produced$ B | Amount$ ManaB | References$ ManaB | SubAbility$ DBManaR +SVar:DBManaR:DB$ Mana | Produced$ R | Amount$ ManaR | References$ ManaR | SubAbility$ DBManaG +SVar:DBManaG:DB$ Mana | Produced$ G | Amount$ ManaG | References$ ManaG +SVar:ManaW:Milled$ChromaSource.W +SVar:ManaU:Milled$ChromaSource.U +SVar:ManaB:Milled$ChromaSource.B +SVar:ManaR:Milled$ChromaSource.R +SVar:ManaG:Milled$ChromaSource.G +SVar:Picture:http://www.wizards.com/global/images/magic/general/charmed_pendant.jpg +Oracle:{T}, Put the top card of your library into your graveyard: For each colored mana symbol in that card's mana cost, add one mana of that color to your mana pool. Activate this ability only any time you could cast an instant. (For example, if the card's mana cost is {3}{U}{U}{B}, you add {U}{U}{B} to your mana pool.) diff --git a/src/main/java/forge/card/ability/AbilityUtils.java b/src/main/java/forge/card/ability/AbilityUtils.java index 321e4cf966d..6c9e2390a68 100644 --- a/src/main/java/forge/card/ability/AbilityUtils.java +++ b/src/main/java/forge/card/ability/AbilityUtils.java @@ -536,6 +536,8 @@ public class AbilityUtils { } } else if (calcX[0].startsWith("Exiled")) { list = ability.getRootAbility().getPaidList("Exiled"); + } else if (calcX[0].startsWith("Milled")) { + list = ability.getRootAbility().getPaidList("Milled"); } else if (calcX[0].startsWith("Tapped")) { list = ability.getRootAbility().getPaidList("Tapped"); } else if (calcX[0].startsWith("Revealed")) {