From b637d2c65cfb48212b34231133b982c1c7aab0e5 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 25 Nov 2015 14:51:41 +0100 Subject: [PATCH] * Fixed layer problem of BecomesCreatureSourceEffect (causes Chimeric Mass to die after entering the Battlefield). --- .../abilities/keywords/DeathtouchTest.java | 5 +- .../cards/continuous/BecomesCreatureTest.java | 86 +++++++++++++++++++ .../BecomesCreatureSourceEffect.java | 6 +- 3 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/continuous/BecomesCreatureTest.java diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeathtouchTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeathtouchTest.java index 9446f81e023..780399d3e8e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeathtouchTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeathtouchTest.java @@ -111,7 +111,7 @@ public class DeathtouchTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Swamp", 10); // Equipped creature has deathtouch and lifelink. - addCard(Zone.BATTLEFIELD, playerA, "Marchesa, the Black Rose"); + addCard(Zone.BATTLEFIELD, playerA, "Basilisk Collar"); /* {R}{G}{W} Legendary Creature - Elemental Beast Marath, Will of the Wild enters the battlefield with a number of +1/+1 counters on @@ -123,6 +123,9 @@ public class DeathtouchTest extends CardTestPlayerBase { */ addCard(Zone.HAND, playerA, "Marath, Will of the Wild", 1); + // Vigilance + // Other creatures you control get +2/+2. + // Creatures your opponents control get -2/-2. addCard(Zone.BATTLEFIELD, playerB, "Elesh Norn, Grand Cenobite"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Marath, Will of the Wild"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/BecomesCreatureTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/BecomesCreatureTest.java new file mode 100644 index 00000000000..612be152634 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/BecomesCreatureTest.java @@ -0,0 +1,86 @@ +/* + * 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.continuous; + +import mage.constants.CardType; +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Assert; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ +public class BecomesCreatureTest extends CardTestPlayerBase { + + @Test + public void testChimericMass() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + + // Chimeric Mass enters the battlefield with X charge counters on it. + // {1}: Until end of turn, Chimeric Mass becomes a Construct artifact creature with "This creature's power and toughness are each equal to the number of charge counters on it." + addCard(Zone.HAND, playerA, "Chimeric Mass", 1); // Artifiact - {X} + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Chimeric Mass"); + setChoice(playerA, "X=3"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}:"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Chimeric Mass", 1); + assertPowerToughness(playerA, "Chimeric Mass", 3, 3); + assertType("Chimeric Mass", CardType.CREATURE, "Construct"); + + } + + @Test + public void testChimericMassAbilityRemoved() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + + // Chimeric Mass enters the battlefield with X charge counters on it. + // {1}: Until end of turn, Chimeric Mass becomes a Construct artifact creature with "This creature's power and toughness are each equal to the number of charge counters on it." + addCard(Zone.HAND, playerA, "Chimeric Mass", 1); // Artifiact - {X} + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Chimeric Mass"); + setChoice(playerA, "X=3"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}:"); + + setStopAt(2, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Chimeric Mass", 1); + assertPowerToughness(playerA, "Chimeric Mass", 0, 0); + assertType("Chimeric Mass", CardType.CREATURE, false); + + Assert.assertTrue("All layered effect have to be removed", currentGame.getContinuousEffects().getLayeredEffects(currentGame).isEmpty()); + + } +} diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java b/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java index 6202880d9b2..b751dd98092 100644 --- a/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java @@ -105,7 +105,7 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements } } } - if ("".equals(type) || type == null) { + if ("".equals(type) || type == null && permanent.getCardType().contains(CardType.LAND)) { permanent.getSubtype().retainAll(CardRepository.instance.getLandTypes()); } if (token.getSubtype().size() > 0) { @@ -124,13 +124,13 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements if (sublayer == SubLayer.NA) { if (token.getAbilities().size() > 0) { for (Ability ability : token.getAbilities()) { - permanent.addAbility(ability, game); + permanent.addAbility(ability, source.getSourceId(), game); } } } break; case PTChangingEffects_7: - if (sublayer == SubLayer.SetPT_7b) { + if (sublayer == SubLayer.CharacteristicDefining_7a) { MageInt power = token.getPower(); MageInt toughness = token.getToughness(); if (power != null && toughness != null) {