diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat index 2319a0c6a..404ad3955 100644 --- a/projects/mtg/bin/Res/sets/10E/_cards.dat +++ b/projects/mtg/bin/Res/sets/10E/_cards.dat @@ -259,6 +259,11 @@ toughness=2 [card] text=Flying (This creature can't be blocked except by creatures with flying or reach.) {T}: Add one mana of any color to your mana pool. abilities=flying +auto={T}:Add{G} +auto={T}:Add{R} +auto={T}:Add{U} +auto={T}:Add{B} +auto={T}:Add{W} alias=1236 id=129906 name=Birds of Paradise diff --git a/projects/mtg/bin/Res/sets/M10/_cards.dat b/projects/mtg/bin/Res/sets/M10/_cards.dat index 7c495e1fc..c021370b6 100644 --- a/projects/mtg/bin/Res/sets/M10/_cards.dat +++ b/projects/mtg/bin/Res/sets/M10/_cards.dat @@ -109,11 +109,11 @@ power=0 toughness=1 text=Flying {T}: Add one mana of any color to your mana pool. abilities=flying -auto={t}:Add{G} -auto={t}:Add{R} -auto={t}:Add{U} -auto={t}:Add{B} -auto={t}:Add{W} +auto={T}:Add{G} +auto={T}:Add{R} +auto={T}:Add{U} +auto={T}:Add{B} +auto={T}:Add{W} rarity=R [/card] [card] diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat index 1a8ccdf27..ebddfe140 100644 --- a/projects/mtg/bin/Res/sets/RAV/_cards.dat +++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat @@ -13,7 +13,11 @@ toughness=3 [/card] [card] text=Flying (This creature can't be blocked except by creatures with flying or reach.) {T}: Add one mana of any color to your mana pool. -alias=1236 +auto={T}:Add{G} +auto={T}:Add{R} +auto={T}:Add{U} +auto={T}:Add{B} +auto={T}:Add{W} id=83688 name=Birds of Paradise color=Green @@ -386,7 +390,7 @@ abilities=mountainwalk [card] text={B}, Sacrifice a creature: Target player loses 1 life. id=89038 -auto={B}{S(creature|myinplay)}:life:-1 opponent +auto={B}{S(creature|myinplay)}:life:-1 target(player) name=Golgari Rotwurm rarity=C type=Creature @@ -915,7 +919,7 @@ type=Artifact mana={1} [/card] [card] -text=Defender (This creature can't attack.) {4}: Tidewater Minion loses defender until end of turn. {T}: Untap target permanent. +text=Defender (This creature can't attack.) {4}: Tidewater Minion loses defender until end of turn. {T}: Untap target permanent. id=83679 name=Tidewater Minion color=Blue diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat index a3b631cd5..cb4604e3e 100644 --- a/projects/mtg/bin/Res/sets/RV/_cards.dat +++ b/projects/mtg/bin/Res/sets/RV/_cards.dat @@ -159,6 +159,11 @@ toughness=1 [card] text=Flying (This creature can't be blocked except by creatures with flying or reach.) {T}: Add one mana of any color to your mana pool. abilities=Flying +auto={T}:Add{G} +auto={T}:Add{R} +auto={T}:Add{U} +auto={T}:Add{B} +auto={T}:Add{W} id=1236 name=Birds of Paradise rarity=R @@ -543,6 +548,8 @@ mana={4}{G}{G} [/card] [card] text=Whenever a land is put into a graveyard from play, Dingus Egg deals 2 damage to that land's controller. +auto=@movedTo(land|opponentgraveyard) from(opponentinplay):damage:2 opponent +auto=@movedTo(land|mygraveyard) from(myinplay):damage:2 controller id=1105 name=Dingus Egg rarity=R diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 0055aa80a..4e5b9a9b2 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -852,7 +852,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver(NEW AConvertToCreatureAura(_id, card,card->target,x,x)); break; } - case 1094: //Ank Of Mishra + case 1094: //Ankh of Mishra { TargetChooser * tc = NULL; TargetChooserFactory tcf; @@ -954,14 +954,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ } break; } - case 1105: //dingus Egg - { - TargetChooser * tc = NULL; - TargetChooserFactory tcf; - tc = tcf.createTargetChooser("land", card); - game->addObserver (NEW ALifeModifierPutinplay(_id,card,tc,-2,2,0)); - break; - } case 1106: //Disrupting Scepter { ADisruptingScepter * ability = NEW ADisruptingScepter(_id,card); @@ -1018,7 +1010,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver(ability); break; } - case 1351: // Island Sancturay + case 1351: // Island Sanctuary { game->addObserver(NEW AIslandSanctuary(_id, card)); break; @@ -1119,7 +1111,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver( NEW ALifeZoneLink(_id ,card, Constants::MTG_PHASE_UPKEEP, -3)); break; } - case 1140: //Throne of bones + case 1140: //Throne of Bone { int cost[] = {Constants::MTG_COLOR_ARTIFACT, 1}; ASpellCastLife* ability = NEW ASpellCastLife(_id, card, Constants::MTG_COLOR_BLACK,NEW ManaCost(cost,1) , 1); @@ -1215,7 +1207,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ } break; } - case 1171: //Paralysis + case 1171: //Paralyze { int cost[] = {Constants::MTG_COLOR_ARTIFACT, 4}; game->addObserver(NEW AUntapManaBlocker(_id, card,card->target, NEW ManaCost(cost,1))); @@ -1289,14 +1281,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver(NEW AAspectOfWolf(_id, card, card->target)); break; } - case 1236: //Birds of Paradise - { - for (int i = Constants::MTG_COLOR_GREEN; i <= Constants::MTG_COLOR_WHITE; i++){ - int output[]={i,1}; - game->addObserver(NEW AManaProducer(_id + i, card, NEW ManaCost(output,1))); - } - break; - } case 1240: //Crumble { card->target->controller()->game->putInGraveyard(card->target);