diff --git a/projects/mtg/bin/Res/sets/ICE/_cards.dat b/projects/mtg/bin/Res/sets/ICE/_cards.dat index 0931b1a45..bcd29cf8c 100644 --- a/projects/mtg/bin/Res/sets/ICE/_cards.dat +++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat @@ -1234,14 +1234,6 @@ power=5 toughness=5 [/card] [card] -text={2}: Prevent the next 1 damage that would be dealt to you this turn. -id=2421 -name=Shield of the Ages -rarity=U -mana={2} -type=Artifact -[/card] -[card] text=Flying, trample id=2534 name=Silver Erne diff --git a/projects/mtg/bin/Res/sets/ICE/todo.dat b/projects/mtg/bin/Res/sets/ICE/todo.dat index 2a4c57b3d..fec00bbe6 100644 --- a/projects/mtg/bin/Res/sets/ICE/todo.dat +++ b/projects/mtg/bin/Res/sets/ICE/todo.dat @@ -1745,6 +1745,14 @@ subtype=Shapeshifter toughness=2 [/card] [card] +text={2}: Prevent the next 1 damage that would be dealt to you this turn. +id=2421 +name=Shield of the Ages +rarity=U +mana={2} +type=Artifact +[/card] +[card] text=Flying Whenever Sibilant Spirit attacks, defending player may draw a card. id=2533 name=Sibilant Spirit diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat index 6310c9e7f..addb55caa 100644 --- a/projects/mtg/bin/Res/sets/RV/_cards.dat +++ b/projects/mtg/bin/Res/sets/RV/_cards.dat @@ -295,14 +295,6 @@ mana={3} type=Artifact [/card] [card] -text=Until end of turn, any time you could activate a mana ability you may pay 1 life. If you do, add {1} to your mana pool. -id=1237 -name=Channel -rarity=U -type=Sorcery -mana={G}{G} -[/card] -[card] text=Target spell or permanent becomes red. (Its mana symbols remain unchanged.) id=1282 name=Chaoslace diff --git a/projects/mtg/bin/Res/sets/RV/todo.dat b/projects/mtg/bin/Res/sets/RV/todo.dat index 75f5e37c0..cfb0960b5 100644 --- a/projects/mtg/bin/Res/sets/RV/todo.dat +++ b/projects/mtg/bin/Res/sets/RV/todo.dat @@ -28,6 +28,14 @@ type=Artifact mana={4} [/card] [card] +text=Until end of turn, any time you could activate a mana ability you may pay 1 life. If you do, add {1} to your mana pool. +id=1237 +name=Channel +rarity=U +type=Sorcery +mana={G}{G} +[/card] +[card] text=Remove Contract from Below from your deck before playing if you're not playing for ante. Discard your hand, add the top card of your library to the ante, then draw seven cards. id=1147 name=Contract from Below diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index fc70f5b60..ec914825a 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -2576,44 +2576,6 @@ class AArmageddonClock:public MTGAbility{ } }; -//Channel -class AChannel:public ActivatedAbility{ - public: - - AChannel(int _id, MTGCardInstance * card):ActivatedAbility(_id, card,0,0,0){ - } - - int isReactingToClick(PlayGuiObject * object){ - if (object->type == GUI_AVATAR){ - Player * player = ((GuiAvatar *)object)->player; - if (player == source->controller()) return 1; - } - return 0; - } - - int resolve(){ - source->controller()->life--; - source->controller()->getManaPool()->add(Constants::MTG_COLOR_ARTIFACT, 1); - return 1; - } - - int testDestroy(){ - if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_UNTAP) return 1; - currentPhase = newPhase; - return 0; - } - - virtual ostream& toString(ostream& out) const - { - out << "AChannel ::: ("; - return ActivatedAbility::toString(out) << ")"; - } - AChannel * clone() const{ - AChannel * a = NEW AChannel(*this); - a->isClone = 1; - return a; - } -}; // Clockwork Beast @@ -3805,36 +3767,6 @@ class AARandomDiscarder:public ActivatedAbilityTP{ } }; - - -//ShieldOfTheAge -class AShieldOfTheAge: public TargetAbility{ - public: - AShieldOfTheAge(int _id, MTGCardInstance * card):TargetAbility(_id,card,NEW DamageTargetChooser(card,_id),NEW ManaCost(),0,0){ - cost->add(Constants::MTG_COLOR_ARTIFACT,2); - } - - int resolve(){ - Damage * damage = tc->getNextDamageTarget(); - if (!damage) return 0; - game->mLayers->stackLayer()->Fizzle(damage); - return 1; - } - - virtual ostream& toString(ostream& out) const - { - out << "AShieldOfTheAge ::: ("; - return TargetAbility::toString(out) << ")"; - } - - AShieldOfTheAge * clone() const{ - AShieldOfTheAge * a = NEW AShieldOfTheAge(*this); - a->isClone = 1; - return a; - } -}; - - //Minion of Leshrac class AMinionofLeshrac: public TargetAbility{ public: diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 1e069c1bc..906b3c702 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1037,11 +1037,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ } break; } - case 1237: //Channel - { - game->addObserver(NEW AChannel(_id, card)); - break; - } case 1282: //Chaoslace { if (card->target){ @@ -1449,11 +1444,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver(NEW AMinionofLeshrac( _id, card)); break; } - case 2421: //Shield of the Age - { - game->addObserver(NEW AShieldOfTheAge( _id, card)); - break; - } // --- addon Mirage --- diff --git a/projects/mtg/src/MTGDeck.cpp b/projects/mtg/src/MTGDeck.cpp index 4a65da90a..d4f9abbdb 100644 --- a/projects/mtg/src/MTGDeck.cpp +++ b/projects/mtg/src/MTGDeck.cpp @@ -323,9 +323,6 @@ bool MTGAllCards::addPrimitive(CardPrimitive * primitive, MTGCard * card){ map::iterator it = t->tempValues.find(primitive->name); if (it != t->tempValues.end()) { primitive->setText(it->second); - }else if (primitive->text.size()){ - OutputDebugString(primitive->name.c_str()); - OutputDebugString("\n"); } //Legacy: