diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 2d430a52d..fad51623f 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -182,6 +182,7 @@ gravedigger.txt hannas_custody.txt harpoon_sniper.txt hellfire.txt +holy_day_i226.txt howl_from_beyond.txt howl_of_the_night_pack.txt hurricane.txt diff --git a/projects/mtg/bin/Res/test/holy_day_i226.txt b/projects/mtg/bin/Res/test/holy_day_i226.txt new file mode 100644 index 000000000..7c7a95e9b --- /dev/null +++ b/projects/mtg/bin/Res/test/holy_day_i226.txt @@ -0,0 +1,43 @@ +#Bug: Holy day lasts after end of turn +[INIT] +FIRSTMAIN +[PLAYER1] +hand:holy day +manapool:{W} +inplay:grizzly bears +[PLAYER2] +[DO] +holy day +next +#begin +next +#attackers +grizzly bears +eot +eot +next +#upkeep +next +#draw +next +#firstmain +next +#begin +next +#attackers +grizzly bears +next +#blockers +next +#damage +next +#end combat +[ASSERT] +COMBATEND +[PLAYER1] +life:20 +graveyard:holy day +inplay:grizzly bears +[PLAYER2] +life:18 +[END] \ No newline at end of file diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 0f04e2b97..bb33baa4b 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -2208,7 +2208,7 @@ class APreventAllCombatDamage:public MTGAbility{ return 1; } - int Destroy(){ + int destroy(){ game->replacementEffects->remove(re); delete re; return 1; diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp index b15e3dafe..5a06df12a 100644 --- a/projects/mtg/src/GameStateDuel.cpp +++ b/projects/mtg/src/GameStateDuel.cpp @@ -118,8 +118,8 @@ void GameStateDuel::loadPlayerRandom(int playerId, int isAI, int mode){ MTGDeck * tempDeck = NEW MTGDeck(mParent->collection); tempDeck->addRandomCards(9,0,0,-1,lands[color1].c_str()); tempDeck->addRandomCards(9,0,0,-1,lands[color2].c_str()); - tempDeck->addRandomCards(1,0,0,'U',"land",colors,nbcolors); - tempDeck->addRandomCards(1,0,0,'R',"land",colors,nbcolors); + tempDeck->addRandomCards(1,0,0,'U',"land"); + tempDeck->addRandomCards(1,0,0,'R',"land"); tempDeck->addRandomCards(12,0,0,-1,"creature",colors,nbcolors); tempDeck->addRandomCards(2,0,0,-1,"sorcery",colors,nbcolors); tempDeck->addRandomCards(2,0,0,-1,"enchantment",colors,nbcolors);