diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/TamiyoFieldResearcher.java b/Mage.Sets/src/mage/sets/eldritchmoon/TamiyoFieldResearcher.java index 2e8464303c2..c79567d3a14 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/TamiyoFieldResearcher.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/TamiyoFieldResearcher.java @@ -157,7 +157,7 @@ class TamiyoFieldResearcherDelayedTriggeredAbility extends DelayedTriggeredAbili private List creatures; public TamiyoFieldResearcherDelayedTriggeredAbility(List creatures) { - super(new DrawCardSourceControllerEffect(1), Duration.UntilYourNextTurn); + super(new DrawCardSourceControllerEffect(1), Duration.UntilYourNextTurn, false); this.creatures = creatures; } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java index a22a34506d8..bc7b5689323 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java @@ -29,7 +29,6 @@ package org.mage.test.cards.planeswalker; import mage.constants.PhaseStep; import mage.constants.Zone; -import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -40,120 +39,120 @@ import org.mage.test.serverside.base.CardTestPlayerBase; public class TamiyoTest extends CardTestPlayerBase { /* - * Reported bug: I activated Tamiyo's +1 ability on a 5/5 Gideon and his 2/2 Knight Ally, but when they both attacked + * Reported bug: I activated Tamiyo's +1 ability on a 5/5 Gideon and his 2/2 Knight Ally, but when they both attacked * and dealt damage I only drew one card when I'm pretty sure I was supposed to draw for each of the two. */ @Test public void testFieldResearcherFirstEffectOnGideon() { - + // Tamiyo, Field Researcher {1}{G}{W}{U} - 4 loyalty - // +1: Choose up to two target creatures. Until your next turn, + // +1: Choose up to two target creatures. Until your next turn, // whenever either of those creatures deals combat damage, you draw a card. addCard(Zone.BATTLEFIELD, playerA, "Tamiyo, Field Researcher", 1); - + /* Gideon, Ally of Zendikar {2}{W}{W} - 4 loyalty - * +1: Until end of turn, Gideon, Ally of Zendikar becomes a 5/5 Human Soldier Ally creature with indestructible + * +1: Until end of turn, Gideon, Ally of Zendikar becomes a 5/5 Human Soldier Ally creature with indestructible * that's still a planeswalker. Prevent all damage that would be dealt to him this turn. * 0: Put a 2/2 white Knight Ally creature token onto the battlefield. **/ addCard(Zone.BATTLEFIELD, playerA, "Gideon, Ally of Zendikar", 1); - + // put 2/2 knight ally token on battlefield activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+0: Put a"); - + // next, activate Gideon to make him a 5/5 human soldier ally creature activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Until end of turn"); // finally, use Tamiyo +1 on both creatures activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Choose up to two"); addTarget(playerA, "Knight Ally^Gideon, Ally of Zendikar"); // both token and Gideon as creature - + // attack with both unblocked - attack(3, playerA, "Knight Ally"); + attack(3, playerA, "Knight Ally"); attack(3, playerA, "Gideon, Ally of Zendikar"); - + setStopAt(3, PhaseStep.END_COMBAT); - execute(); - + execute(); + assertLife(playerB, 13); // 5 + 2 damage, 20 - 7 = 13 assertPermanentCount(playerA, "Tamiyo, Field Researcher", 1); assertPermanentCount(playerA, "Gideon, Ally of Zendikar", 1); assertPermanentCount(playerA, "Knight Ally", 1); assertHandCount(playerA, 3); // two cards drawn from each creature dealing damage + 1 card drawn on turn } - + /* * Testing more basic scenario with Tamiyo, Field of Researcher +1 effect */ @Test public void testFieldResearcherFirstEffectSimpleCreatureAttacks() { - + // Tamiyo, Field Researcher {1}{G}{W}{U} - 4 loyalty - // +1: Choose up to two target creatures. Until your next turn, + // +1: Choose up to two target creatures. Until your next turn, // whenever either of those creatures deals combat damage, you draw a card. addCard(Zone.BATTLEFIELD, playerA, "Tamiyo, Field Researcher", 1); - + addCard(Zone.BATTLEFIELD, playerA, "Bronze Sable", 1); // 2/1 activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Choose up to two"); addTarget(playerA, "Bronze Sable"); - + attack(1, playerA, "Bronze Sable"); - + setStopAt(1, PhaseStep.END_COMBAT); execute(); - + assertLife(playerB, 18); assertHandCount(playerA, 1); } - + /* * Testing more basic scenario with Tamiyo, Field of Researcher +1 effect */ @Test public void testFieldResearcherFirstEffectSimpleCreaturesAttacks() { - + // Tamiyo, Field Researcher {1}{G}{W}{U} - 4 loyalty - // +1: Choose up to two target creatures. Until your next turn, + // +1: Choose up to two target creatures. Until your next turn, // whenever either of those creatures deals combat damage, you draw a card. addCard(Zone.BATTLEFIELD, playerA, "Tamiyo, Field Researcher", 1); - + addCard(Zone.BATTLEFIELD, playerA, "Bronze Sable", 1); // 2/1 addCard(Zone.BATTLEFIELD, playerA, "Sylvan Advocate", 1); // 2/3 activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Choose up to two"); addTarget(playerA, "Bronze Sable^Sylvan Advocate"); - + attack(1, playerA, "Bronze Sable"); attack(1, playerA, "Sylvan Advocate"); - + setStopAt(1, PhaseStep.END_COMBAT); execute(); - + assertLife(playerB, 16); assertHandCount(playerA, 2); } - + /* * Testing more basic scenarios with Tamiyo, Field of Researcher +1 effect */ @Test public void testFieldResearcherFirstEffectAttackAndBlock() { - + // Tamiyo, Field Researcher {1}{G}{W}{U} - 4 loyalty - // +1: Choose up to two target creatures. Until your next turn, + // +1: Choose up to two target creatures. Until your next turn, // whenever either of those creatures deals combat damage, you draw a card. addCard(Zone.BATTLEFIELD, playerA, "Tamiyo, Field Researcher", 1); - + addCard(Zone.BATTLEFIELD, playerA, "Sylvan Advocate", 1); // 2/3 addCard(Zone.BATTLEFIELD, playerB, "Memnite", 1); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Choose up to two"); addTarget(playerA, "Sylvan Advocate"); - + attack(1, playerA, "Sylvan Advocate"); attack(2, playerB, "Memnite"); block(2, playerA, "Sylvan Advocate", "Memnite"); - + setStopAt(2, PhaseStep.END_COMBAT); execute(); - + assertLife(playerB, 18); assertHandCount(playerA, 2); // Sylvan Advocate dealt combat damage twice }