From afb7de2fbb297c5df3308fbb64e34ffc97a84747 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 6 May 2017 11:49:49 +0200 Subject: [PATCH] * Gitrog Monster - Fixed that triggered ability was not handled correctly after a control change (fixes #3251). --- .../cards/control/VengefulPharaohTest.java | 74 +++++++++++++++++++ .../single/soi/TheGitrogMonsterTest.java | 10 ++- .../mage/abilities/TriggeredAbilities.java | 3 - 3 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/control/VengefulPharaohTest.java diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/VengefulPharaohTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/VengefulPharaohTest.java new file mode 100644 index 00000000000..159c220d8d9 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/VengefulPharaohTest.java @@ -0,0 +1,74 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package org.mage.test.cards.control; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ +public class VengefulPharaohTest extends CardTestPlayerBase { + + @Test + public void controlledByOtherBeforeGraveyardTriggerTest() { + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + // Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.) + // Whenever combat damage is dealt to you or a planeswalker you control, if Vengeful Pharaoh is in your graveyard, destroy target attacking creature, then put Vengeful Pharaoh on top of your library. + addCard(Zone.HAND, playerA, "Vengeful Pharaoh", 1); // Creature 5/4 {2}{B}{B}{B} + // Destroy target permanent. + addCard(Zone.HAND, playerA, "Vindicate", 1); // Sorcery {1}{W}{B} + + addCard(Zone.HAND, playerB, "Control Magic", 1); // Enchantment + addCard(Zone.BATTLEFIELD, playerB, "Island", 4); + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Vengeful Pharaoh"); + + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Control Magic", "Vengeful Pharaoh"); + + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Vindicate", "Vengeful Pharaoh"); + + attack(4, playerB, "Silvercoat Lion"); + + setStopAt(4, PhaseStep.POSTCOMBAT_MAIN); + execute(); + + assertGraveyardCount(playerA, "Vindicate", 1); + assertGraveyardCount(playerB, "Control Magic", 1); + assertGraveyardCount(playerB, "Silvercoat Lion", 1); + assertGraveyardCount(playerA, "Vengeful Pharaoh", 0); + assertLibraryCount(playerA, "Vengeful Pharaoh", 1); + + assertLife(playerA, 18); + } +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TheGitrogMonsterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TheGitrogMonsterTest.java index 0be968bf198..17a9cfbb101 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TheGitrogMonsterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TheGitrogMonsterTest.java @@ -97,8 +97,8 @@ public class TheGitrogMonsterTest extends CardTestPlayerBase { } /** - * NOTE: As of 05/05/2017 this test is failing due to a bug in code. - * See issue #3251 + * NOTE: As of 05/05/2017 this test is failing due to a bug in code. See + * issue #3251 * * I took control of a Gitrog Monster, while the Gitrog Monster's owner * controlled a Dryad Arbor and cast Toxic Deluge for 6. @@ -110,6 +110,8 @@ public class TheGitrogMonsterTest extends CardTestPlayerBase { // You may play an additional land on each of your turns. // Whenever one or more land cards are put into your graveyard from anywhere, draw a card. addCard(Zone.HAND, playerA, "The Gitrog Monster", 1); // Creature 6/6 {3}{B}{G} + // As an additional cost to cast Toxic Deluge, pay X life. + // All creatures get -X/-X until end of turn. addCard(Zone.HAND, playerA, "Toxic Deluge", 1); // Sorcery {2}{B} // (Dryad Arbor isn't a spell, it's affected by summoning sickness, and it has "{T}: Add {G} to your mana pool.") addCard(Zone.HAND, playerA, "Dryad Arbor", 1); // Land Creature 1/1 @@ -147,8 +149,8 @@ public class TheGitrogMonsterTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "The Gitrog Monster", 1); assertGraveyardCount(playerA, "Dryad Arbor", 1); - assertHandCount(playerB, 1); // 1 drawn in draw of turn 2 - assertHandCount(playerA, 1); // 1 drawn in draw of turn 3 - no card sfro Gitrog + assertHandCount(playerB, 1); // 1 drawn in draw step of turn 2 + assertHandCount(playerA, 1); // 1 drawn in draw step of turn 3 - no card from Gitrog } } diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilities.java b/Mage/src/main/java/mage/abilities/TriggeredAbilities.java index 65b3b92bc84..d71c080b6e2 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbilities.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbilities.java @@ -37,7 +37,6 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import mage.MageObject; -import mage.cards.Card; import mage.constants.Zone; import mage.designations.Designation; import mage.game.Game; @@ -119,8 +118,6 @@ public class TriggeredAbilities extends ConcurrentHashMap