diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt index c2c2b4154..ad1b6fd9d 100644 --- a/projects/mtg/bin/Res/sets/primitives/mtg.txt +++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt @@ -37416,7 +37416,7 @@ subtype=Aura [card] name=Fury Charm auto=may destroy target(artifact) -auto=may 1/1 && trample target(creature) +auto=may name(1/1 & trample) target(creature) transforms((,newability[1/1],newability[trample])) ueot auto=may counter(0/0,-2,Time) target(*) text=Choose one - Destroy target artifact; or target creature gets +1/+1 and gains trample until end of turn; or remove two time counters from target permanent or suspended card. mana={1}{R} @@ -79332,6 +79332,7 @@ auto=this(variable{plandu}>0) {t}:add{u} auto=this(variable{plandr}>0) {t}:add{r} auto=this(variable{plandb}>0) {t}:add{b} auto=this(variable{plandw}>0) {t}:add{w} +auto=this(variable{plandc}>0) {t}:add{1} text={T}: Add to your mana pool one mana of any type that a land you control could produce. type=Land [/card] @@ -86780,7 +86781,7 @@ type=Artifact [/card] [card] name=Selesnya Charm -auto=choice target(creature) 2/2 && trample ueot +auto=choice name(2/2 & trample) target(creature) transforms((,newability[2/2],newability[trample])) ueot auto=choice moveTo(exile) target(creature[power>=5]) auto=choice token(Knight,Creature Knight,2/2,white,vigilance) text=Choose one — Target creature gets +2/+2 and gains trample until end of turn; or exile target creature with power 5 or greater; or put a 2/2 white Knight creature token with vigilance onto the battlefield. @@ -110430,7 +110431,7 @@ toughness=1 [card] name=Vitality Charm auto=choice token(Insect,creature insect, 1/1,green) -auto=aslongas(creature|battlefield) choice 1/1 && trample target(creature) +auto=aslongas(creature|battlefield) choice name(1/1 & trample) target(creature) transforms((,newability[1/1],newability[trample])) ueot auto=aslongas(beast|battlefield) choice regenerate target(beast) text=Choose one - Put a 1/1 green Insect creature token onto the battlefield; or target creature gets +1/+1 and gains trample until end of turn; or regenerate target Beast. mana={G} diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 79f3dc0ba..f8c9646b6 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -584,6 +584,11 @@ private: { intValue = countManaProducedby(Constants::MTG_COLOR_WHITE, target, target->controller()->opponent()); } + else if (s == "olandc") + { + intValue = countManaProducedby(Constants::MTG_COLOR_ARTIFACT, target, target->controller()->opponent()) + + countManaProducedby(Constants::MTG_COLOR_WASTE, target, target->controller()->opponent()); + } else if (s == "plandg") { intValue = countManaProducedby(Constants::MTG_COLOR_GREEN, target, target->controller()); @@ -604,6 +609,11 @@ private: { intValue = countManaProducedby(Constants::MTG_COLOR_WHITE, target, target->controller()); } + else if (s == "plandc") + { + intValue = countManaProducedby(Constants::MTG_COLOR_ARTIFACT, target, target->controller()) + + countManaProducedby(Constants::MTG_COLOR_WASTE, target, target->controller()); + } else if (s == "cantargetmycre")// can target my creature { intValue = countCanTargetby("creature", card, card->controller());