diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index a896904c5..36a8f9b19 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -142,6 +142,7 @@ clone.txt clone2.txt clone3.txt cockatrice.txt +cockatrice_i228.txt colossus_of_sardia1.txt colossus_of_sardia2.txt composite_golem.txt diff --git a/projects/mtg/bin/Res/test/cockatrice_i228.txt b/projects/mtg/bin/Res/test/cockatrice_i228.txt new file mode 100644 index 000000000..09519369c --- /dev/null +++ b/projects/mtg/bin/Res/test/cockatrice_i228.txt @@ -0,0 +1,28 @@ +#Bug: Regenerate should prevent cokcatrice's effect +#see http://code.google.com/p/wagic/issues/detail?id=228 +[INIT] +COMBATATTACKERS +[PLAYER1] +inplay:Charging Troll,forest +[PLAYER2] +inplay:cockatrice +[DO] +Charging Troll +next +#blockers +cockatrice +next +yes +forest +Charging Troll +endinterruption +#damage +next +#end combat +[ASSERT] +COMBATEND +[PLAYER1] +inplay:Charging Troll,forest +[PLAYER2] +inplay:cockatrice +[END] \ No newline at end of file diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 542571e21..71f094cd9 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -2134,7 +2134,7 @@ class AOldSchoolDeathtouch:public MTGAbility{ } }else if (newPhase == Constants::MTG_PHASE_COMBATEND){ for (int i = 0; i < nbOpponents ; i++){ - game->mLayers->stackLayer()->addPutInGraveyard(opponents[i]); + opponents[i]->destroy(); } } }