diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 2e58a153c..ba72d1499 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -324,6 +324,7 @@ hopping_automaton_i232.txt horned_helm.txt howl_from_beyond.txt howl_of_the_night_pack.txt +howling_mine_i614.txt hunted_dragon.txt hunting_pack.txt hurricane.txt diff --git a/projects/mtg/bin/Res/test/howling_mine_i614.txt b/projects/mtg/bin/Res/test/howling_mine_i614.txt new file mode 100644 index 000000000..75c8494de --- /dev/null +++ b/projects/mtg/bin/Res/test/howling_mine_i614.txt @@ -0,0 +1,23 @@ +#Testing Howling Mine Revised Edition +[INIT] +SECONDMAIN +[PLAYER1] +inplay:1112 +[PLAYER2] +library:island,forest,mountain +[DO] +eot +next +#upkeep +next +#draw +next +#FIRSTMAIN +[ASSERT] +FIRSTMAIN +[PLAYER1] +inplay:1112 +[PLAYER2] +hand:mountain,forest +library:island +[END] \ No newline at end of file diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 5cfe84047..49a154db5 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -2907,10 +2907,10 @@ public: string name; string sabilities; string starfound; - string spt; WParsedInt * multiplier; int who; bool aLivingWeapon; + string spt; bool battleReady; MTGCardInstance * myToken; vector currentAbilities; @@ -4488,36 +4488,6 @@ public: } }; -//1112 Howling Mine -class AHowlingMine: public MTGAbility -{ -public: - AHowlingMine(int _id, MTGCardInstance * _source) : - MTGAbility(_id, _source) - { - } - - void Update(float dt) - { - if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_DRAW && !source->isTapped()) - { - game->mLayers->stackLayer()->addDraw(game->currentPlayer); - } - } - - virtual ostream& toString(ostream& out) const - { - out << "AHowlingMine ::: ("; - return MTGAbility::toString(out) << ")"; - } - AHowlingMine * clone() const - { - AHowlingMine * a = NEW AHowlingMine(*this); - a->isClone = 1; - return a; - } -}; - //Kjeldoran Frostbeast class AKjeldoranFrostbeast: public MTGAbility { diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 8c1fbf65a..0547f4fe6 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -3293,11 +3293,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell) game->addObserver(NEW AFireball(_id, card, spell, x)); break; } - case 1112: //Howling Mine - { - game->addObserver(NEW AHowlingMine(_id, card)); - break; - } case 1113: //Iron Star { int cost[] = { Constants::MTG_COLOR_ARTIFACT, 1 };