diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat index 915ddc1a5..bee9f70e9 100644 --- a/projects/mtg/bin/Res/sets/RV/_cards.dat +++ b/projects/mtg/bin/Res/sets/RV/_cards.dat @@ -562,14 +562,6 @@ mana={1}{W} type=Instant [/card] [card] -text={3}, {T}: Target player discards a card. Activate this ability only during your turn. -id=1106 -name=Disrupting Scepter -rarity=R -type=Artifact -mana={3} -[/card] -[card] text={2}: Dragon Engine gets +1/+0 until end of turn. id=1107 name=Dragon Engine diff --git a/projects/mtg/bin/Res/sets/RV/todo.dat b/projects/mtg/bin/Res/sets/RV/todo.dat index ba53865b3..460553c86 100644 --- a/projects/mtg/bin/Res/sets/RV/todo.dat +++ b/projects/mtg/bin/Res/sets/RV/todo.dat @@ -88,6 +88,14 @@ type=Sorcery mana={X}{R} [/card] [card] +text={3}, {T}: Target player discards a card. Activate this ability only during your turn. +id=1106 +name=Disrupting Scepter +rarity=R +type=Artifact +mana={3} +[/card] +[card] text=Target player plays a mana ability of each land he or she controls, then empties his or her mana pool. Add mana to your mana pool equal to the type and amount emptied from that player's mana pool this way. id=1198 name=Drain Power diff --git a/projects/mtg/bin/Res/test/bugs/disrupting_scepter_i163.txt b/projects/mtg/bin/Res/test/wontfix/disrupting_scepter_i163.txt similarity index 100% rename from projects/mtg/bin/Res/test/bugs/disrupting_scepter_i163.txt rename to projects/mtg/bin/Res/test/wontfix/disrupting_scepter_i163.txt diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 94ddcec62..604c5e11b 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -2704,50 +2704,6 @@ class AConservator: public MTGAbility{ }; -//1106 DisruptingScepter -class ADisruptingScepter:public TargetAbility{ - public: - ADisruptingScepter(int id, MTGCardInstance * _source):TargetAbility(id,_source){ - int zones[] = {MTGGameZone::OPPONENT_HAND}; - tc = NEW TargetZoneChooser(zones,1,_source); - int _cost[] = {Constants::MTG_COLOR_ARTIFACT, 3}; - cost = NEW ManaCost(_cost,1); - } - - void Update(float dt){ - if (game->opponent()->isAI()){ - if(waitingForAnswer){ - MTGCardInstance * card = ((AIPlayer *)game->opponent())->chooseCard(tc, source); - if (card) tc->toggleTarget(card); - if (!card || tc->targetsReadyCheck() == TARGET_OK) { - waitingForAnswer = 0; - game->mLayers->actionLayer()->setCurrentWaitingAction(NULL); - } - } - TargetAbility::Update(dt); - }else{ - TargetAbility::Update(dt); - } - } - - int resolve(){ - game->opponent()->game->putInGraveyard(tc->getNextCardTarget()); - return 1; - } - - virtual ostream& toString(ostream& out) const - { - out << "ADisruptingScepter ::: ("; - return TargetAbility::toString(out) << ")"; - } - ADisruptingScepter * clone() const{ - ADisruptingScepter * a = NEW ADisruptingScepter(*this); - a->isClone = 1; - return a; - } -}; - - //1345 Farmstead class AFarmstead:public ActivatedAbility{ public: diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index efb2b378f..3052292ce 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1070,12 +1070,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ } break; } - case 1106: //Disrupting Scepter - { - ADisruptingScepter * ability = NEW ADisruptingScepter(_id,card); - game->addObserver(ability); - break; - } case 1284: //Dragon Whelp { game->addObserver(NEW ADragonWhelp(_id,card));