From 2822c18b813043e9d4c0d2ddb6ebf035e26b9994 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 20 Apr 2015 17:35:32 +0200 Subject: [PATCH] * Triton Tactics - Fixed that the don't untap effect for the blocked creatures did not work. --- .../src/mage/sets/theros/TritonTactics.java | 4 +- .../mage/test/cards/rules/DontUntapTest.java | 77 +++++++++++++++++++ .../cards/watchers/SiftThroughSandsTest.java | 3 + .../abilities/effects/ContinuousEffects.java | 2 +- 4 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/rules/DontUntapTest.java diff --git a/Mage.Sets/src/mage/sets/theros/TritonTactics.java b/Mage.Sets/src/mage/sets/theros/TritonTactics.java index 1c8f775f7b5..4abfcddef92 100644 --- a/Mage.Sets/src/mage/sets/theros/TritonTactics.java +++ b/Mage.Sets/src/mage/sets/theros/TritonTactics.java @@ -65,8 +65,6 @@ public class TritonTactics extends CardImpl { super(ownerId, 71, "Triton Tactics", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "THS"; - this.color.setBlue(true); - // Up to two target creatures each get +0/+3 until end of turn. Untap those creatures. // At this turn's next end of combat, tap each creature that was blocked by one of those // creatures this turn and it doesn't untap during its controller's next untap step. @@ -127,7 +125,7 @@ class TritonTacticsUntapTargetEffect extends OneShotEffect { } else { targetMap = new HashMap<>(); } - targetMap.put(new Integer(game.getCard(source.getSourceId()).getZoneChangeCounter(game)), targets); + targetMap.put(game.getCard(source.getSourceId()).getZoneChangeCounter(game), targets); if (object == null) { game.getState().setValue("targets" + source.getSourceId().toString(), targetMap); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/DontUntapTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/DontUntapTest.java new file mode 100644 index 00000000000..78fe3765978 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/DontUntapTest.java @@ -0,0 +1,77 @@ +/* + * 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.rules; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class DontUntapTest extends CardTestPlayerBase { + + /** + * Test that the attackers blocked by creatures boosted with + * Triton Tactics do not untap in their controllers next untap step + */ + @Test + public void testTritonTactics() { + // Up to two target creatures each get +0/+3 until end of turn. Untap those creatures. + // At this turn's next end of combat, tap each creature that was blocked by one of those + // creatures this turn and it doesn't untap during its controller's next untap step. + addCard(Zone.HAND, playerA, "Triton Tactics"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 1); + // {T}: You gain 1 life. + addCard(Zone.BATTLEFIELD, playerA, "Soulmender", 1); + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); + + activateAbility(4, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}: You gain 1 life"); + + attack(4, playerB, "Silvercoat Lion"); + castSpell(4, PhaseStep.DECLARE_ATTACKERS, playerA, "Triton Tactics", "Soulmender"); + block(4, playerA, "Soulmender", "Silvercoat Lion"); + + setStopAt(6, PhaseStep.DRAW); + execute(); + + assertGraveyardCount(playerA, "Triton Tactics", 1); + + assertPowerToughness(playerA, "Soulmender", 1, 1); + + assertPowerToughness(playerB, "Silvercoat Lion", 2, 2); + assertTapped("Silvercoat Lion", true); // Should be stilled tapped in turn 6 because it was blocked in turn 4 with Triton Tactics + + assertLife(playerA, 21); + assertLife(playerB, 20); + + } +} \ No newline at end of file diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SiftThroughSandsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SiftThroughSandsTest.java index 13b4b6c999b..b199e6e6597 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SiftThroughSandsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SiftThroughSandsTest.java @@ -58,6 +58,9 @@ public class SiftThroughSandsTest extends CardTestPlayerBase { } + // TODO: This test fails sometimes if building the complete test project + // cause is still unknown + // test that The Unspeakable is not put onto the battlefield @Test public void testNotTheUnspeakable() { diff --git a/Mage/src/mage/abilities/effects/ContinuousEffects.java b/Mage/src/mage/abilities/effects/ContinuousEffects.java index ef6367aace6..c7426d4181a 100644 --- a/Mage/src/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/mage/abilities/effects/ContinuousEffects.java @@ -390,7 +390,7 @@ public class ContinuousEffects implements Serializable { } private boolean checkAbilityStillExists(Ability ability, ContinuousEffect effect, GameEvent event, Game game) { - if (effect.getDuration().equals(Duration.OneUse) || ability.getSourceId() == null) { // needed for some special replacment effects (e.g. Undying) or commander replacement effect + if (effect.getDuration().equals(Duration.OneUse) || effect.getDuration().equals(Duration.Custom) || ability.getSourceId() == null) { // needed for some special replacment effects (e.g. Undying) or commander replacement effect return true; } MageObject object;