From 81498810019b78a2bedbdb65c36594ab8c93bccb Mon Sep 17 00:00:00 2001 From: leungclj Date: Wed, 29 Jul 2009 01:11:33 +0000 Subject: [PATCH] Jonathan - some clean up --- projects/mtg/bin/Res/sets/10E/_cards.dat | 1 + projects/mtg/bin/Res/sets/POR/_cards.dat | 11 ++++++++ projects/mtg/bin/Res/sets/POR/todo.dat | 8 ------ projects/mtg/bin/Res/sets/RV/_cards.dat | 2 ++ projects/mtg/bin/Res/sets/TMP/_cards.dat | 2 ++ projects/mtg/bin/Res/sets/USG/_cards.dat | 3 +++ projects/mtg/include/AllAbilities.h | 33 ------------------------ projects/mtg/src/MTGAbility.cpp | 28 +------------------- 8 files changed, 20 insertions(+), 68 deletions(-) diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat index 11c50fb04..cf72fd672 100644 --- a/projects/mtg/bin/Res/sets/10E/_cards.dat +++ b/projects/mtg/bin/Res/sets/10E/_cards.dat @@ -2246,6 +2246,7 @@ toughness=6 [card] text=Untap all permanents you control during each other player's untap step. id=129722 +auto=@each opponent untap:untap all(*|myinplay) name=Seedborn Muse rarity=R color=Green diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat index 872ae9d3c..ca9ed5a90 100644 --- a/projects/mtg/bin/Res/sets/POR/_cards.dat +++ b/projects/mtg/bin/Res/sets/POR/_cards.dat @@ -997,6 +997,17 @@ power=6 toughness=3 [/card] [card] +text=Destroy target creature. Its owner gains 4 life. +id=4389 +target=creature +auto=destroy +auto=life:4 targetController +name=Path of Peace +rarity=C +type=Sorcery +mana={3}{W} +[/card] +[card] text=Phantom Warrior is unblockable. id=4272 name=Phantom Warrior diff --git a/projects/mtg/bin/Res/sets/POR/todo.dat b/projects/mtg/bin/Res/sets/POR/todo.dat index e3a1827fd..9cbd2b168 100644 --- a/projects/mtg/bin/Res/sets/POR/todo.dat +++ b/projects/mtg/bin/Res/sets/POR/todo.dat @@ -315,14 +315,6 @@ subtype=Bird toughness=1 [/card] [card] -text=Destroy target creature. Its owner gains 4 life. -id=4389 -name=Path of Peace -rarity=C -type=Sorcery -mana={3}{W} -[/card] -[card] text=Search your library for a sorcery card and reveal that card. Shuffle your library, then put the card on top of it. id=4271 name=Personal Tutor diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat index 9b4b6bf0b..b26148cca 100644 --- a/projects/mtg/bin/Res/sets/RV/_cards.dat +++ b/projects/mtg/bin/Res/sets/RV/_cards.dat @@ -1195,6 +1195,8 @@ mana={U} [card] text=At the beginning of each player's upkeep, Karma deals damage to that player equal to the number of Swamps he or she controls. id=1352 +auto=@each upkeep:foreach(swamp|myinplay) damage:1 controller +auto=@each upkeep:foreach(swamp|opponentinplay) damage:1 opponent name=Karma rarity=U type=Enchantment diff --git a/projects/mtg/bin/Res/sets/TMP/_cards.dat b/projects/mtg/bin/Res/sets/TMP/_cards.dat index bba2c3115..82fd906d2 100644 --- a/projects/mtg/bin/Res/sets/TMP/_cards.dat +++ b/projects/mtg/bin/Res/sets/TMP/_cards.dat @@ -27,6 +27,8 @@ type=Sorcery [card] text=At the beginning of each player's upkeep, Ancient Runes deals damage to that player equal to the number of artifacts he or she controls. id=4801 +auto=@each upkeep:foreach(artifact|myinplay) damage:1 controller +auto=@each upkeep:foreach(artifact|opponentinplay) damage:1 opponent name=Ancient Runes rarity=U type=Enchantment diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat index b4c955ba9..d7d0820dc 100644 --- a/projects/mtg/bin/Res/sets/USG/_cards.dat +++ b/projects/mtg/bin/Res/sets/USG/_cards.dat @@ -854,6 +854,9 @@ subtype=Aura text=Destroy target creature. Its owner gains 4 life. id=5684 target=creature +auto=destroy +auto=life:4 targetController +target=creature name=Path of Peace rarity=C type=Sorcery diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 542fdd50f..5254e4229 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -4001,39 +4001,6 @@ class ARampageAbility:public MTGAbility{ } }; -// Seedborn Muse -class ASeedbornMuse: public TriggeredAbility{ - public: - ASeedbornMuse(int _id, MTGCardInstance * _source):TriggeredAbility(_id, _source){ - } - - int trigger(){ - if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_UPKEEP && ((MTGCardInstance *) source)->controller()!= game->currentPlayer){ - return 1; - } - return 0; - } - - int resolve(){ - for (int j = source->controller()->game->inPlay->nb_cards-1; j >=0 ; j--){ - MTGCardInstance * current = source->controller()->game->inPlay->cards[j]; - current->untap(); - } - return 1; - } - virtual ostream& toString(ostream& out) const - { - out << "ASeedbornMuse ::: ("; - return TriggeredAbility::toString(out) << ")"; - } - - ASeedbornMuse * clone() const{ - ASeedbornMuse * a = NEW ASeedbornMuse(*this); - a->isClone = 1; - return a; - } -}; - //Instant Steal control of a target class AInstantControlSteal: public InstantAbility{ public: diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index b96df168b..ecb457b2c 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1338,7 +1338,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ break; } - case 1285: //Dwarven Warriors{ + case 1285: //Dwarven Warriors { CreatureTargetChooser * tc = NEW CreatureTargetChooser(card); tc->maxpower = 2; @@ -1415,11 +1415,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver(NEW AProtectionFrom( _id,card, card->target, Constants::MTG_COLOR_GREEN)); break; } - case 1352: //Karma - { - game->addObserver(NEW ADamageForTypeControlled(_id, card,"swamp")); - break; - } case 1359: //Red Ward { game->addObserver(NEW AProtectionFrom( _id,card, card->target, Constants::MTG_COLOR_RED)); @@ -1568,13 +1563,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ break; } -//---addon Tempest--- - case 4801: //Ancient Rune - { - game->addObserver(NEW ADamageForTypeControlled(_id, card,"artifact")); - break; - } - // --- addon Mirage --- case 3410: //Seed of Innocence @@ -1605,15 +1593,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ break; } - case 5684://Path of Peace - { - Player * p = card->target->controller(); - p->game->putInGraveyard(card->target); - p->life+= 4; - break; - } - - //-- addon 10E--- case 129710: //Angelic Chorus @@ -1642,11 +1621,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver( NEW ALavaborn(_id ,card, Constants::MTG_PHASE_UPKEEP, -3,-3)); break; } - case 129722 : //Seddborn Muse - { - game->addObserver( NEW ASeedbornMuse(_id ,card)); - break; - } case 135246: //Dreamborn Muse { game->addObserver( NEW ADreambornMuse(_id ,card));