diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat index d3d24a37f..4756e9e18 100644 --- a/projects/mtg/bin/Res/sets/RV/_cards.dat +++ b/projects/mtg/bin/Res/sets/RV/_cards.dat @@ -1998,14 +1998,6 @@ mana={1} type=Artifact [/card] [card] -text=Whenever a creature is put into a graveyard from the battlefield, you may pay {1}. If you do, you gain 1 life. -id=1136 -name=Soul Net -rarity=U -mana={1} -type=Artifact -[/card] -[card] text=Counter target spell with converted mana cost X. id=1224 name=Spell Blast diff --git a/projects/mtg/bin/Res/sets/RV/todo.dat b/projects/mtg/bin/Res/sets/RV/todo.dat index 5893bbb6a..9724d1f26 100644 --- a/projects/mtg/bin/Res/sets/RV/todo.dat +++ b/projects/mtg/bin/Res/sets/RV/todo.dat @@ -487,6 +487,14 @@ type=Instant mana={U} [/card] [card] +text=Whenever a creature is put into a graveyard from the battlefield, you may pay {1}. If you do, you gain 1 life. +id=1136 +name=Soul Net +rarity=U +mana={1} +type=Artifact +[/card] +[card] text=Players can't untap more than one creature during their untap steps. id=1319 name=Smoke diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 6fa5a3dd7..4bd4ea54f 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -3500,45 +3500,6 @@ class AIslandSanctuary:public MTGAbility{ }; -//Soul Net -class ASoulNet:public ActivatedAbility{ - public: - PutInGraveyard * latest; - PutInGraveyard * newDead; - ASoulNet(int _id, MTGCardInstance * card):ActivatedAbility(_id, card,0,0,0){ - int _cost[] = {Constants::MTG_COLOR_ARTIFACT, 1}; - cost = NEW ManaCost(_cost,1); - latest = ((PutInGraveyard *) GameObserver::GetInstance()->mLayers->stackLayer()->getPrevious(NULL,ACTION_PUTINGRAVEYARD,RESOLVED_OK)); - newDead = latest; - } - - int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL){ - newDead = ((PutInGraveyard *) GameObserver::GetInstance()->mLayers->stackLayer()->getPrevious(NULL,ACTION_PUTINGRAVEYARD,RESOLVED_OK)); - if (newDead && newDead != latest && newDead->card->isCreature()) - return ActivatedAbility::isReactingToClick(card,mana); - return 0; - } - int resolve(){ - latest = newDead; - source->controller()->life++; - return 1; - } - - virtual ostream& toString(ostream& out) const - { - out << "ASoulNet ::: latest : " << latest - << " ; newDead : " << newDead - << " ("; - return ActivatedAbility::toString(out) << ")"; - } - ASoulNet * clone() const{ - ASoulNet * a = NEW ASoulNet(*this); - a->isClone = 1; - return a; - } -}; - - //Stasis class AStasis:public ActivatedAbility{ public: diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 400f09cbd..de0b87c76 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1194,11 +1194,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ } break; } - case 1136: //Soul Net - { - game->addObserver( NEW ASoulNet(_id ,card)); - break; - } case 1139: //The Rack {