diff --git a/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java b/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java index 04c202f22a6..a71a450d4b4 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java +++ b/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java @@ -33,7 +33,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; -import mage.abilities.effects.common.continuous.LoseAllAbilitiesTargetEffect; import mage.cards.CardImpl; import mage.game.permanent.token.FrogToken; import mage.target.common.TargetCreaturePermanent; @@ -48,8 +47,6 @@ public class TurnToFrog extends CardImpl { super(ownerId, 78, "Turn to Frog", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "M12"; - this.color.setBlue(true); - // Until end of turn, target creature loses all abilities and becomes a blue Frog with base power and toughness 1/1. Effect effect = new BecomesCreatureTargetEffect(new FrogToken(), true, false, Duration.EndOfTurn); effect.setText("Until end of turn, target creature loses all abilities and becomes a blue Frog with base power and toughness 1/1"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java index 5d1c8362b3e..3a9bb20f249 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java @@ -46,7 +46,7 @@ public class ThragtuskTest extends CardTestPlayerBase { * Test if a Thragtusk is copied by a PhyrexianMetamorph * that both triggers cotrrect work */ - @Test + @Test public void testPhyrexianMetamorph() { addCard(Zone.BATTLEFIELD, playerA, "Island", 4); // You may have Phyrexian Metamorph enter the battlefield as a copy of any artifact or creature on the battlefield, except it's an artifact in addition to its other types @@ -88,8 +88,9 @@ public class ThragtuskTest extends CardTestPlayerBase { // You may have Phyrexian Metamorph enter the battlefield as a copy of any artifact or creature on the battlefield, except it's an artifact in addition to its other types addCard(Zone.HAND, playerA, "Phyrexian Metamorph", 1); - addCard(Zone.BATTLEFIELD, playerB, "Island", 2); + addCard(Zone.BATTLEFIELD, playerB, "Island", 6); addCard(Zone.BATTLEFIELD, playerB, "Swamp", 6); + addCard(Zone.HAND, playerB, "Tortoise Formation", 1); addCard(Zone.HAND, playerB, "Turn to Frog", 1); addCard(Zone.HAND, playerB, "Public Execution", 1); addCard(Zone.BATTLEFIELD, playerB, "Thragtusk", 1); @@ -97,13 +98,17 @@ public class ThragtuskTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phyrexian Metamorph"); setChoice(playerA, "Yes"); setChoice(playerA, "Thragtusk"); + + castSpell(1, PhaseStep.BEGIN_COMBAT, playerB, "Tortoise Formation"); - castSpell(1, PhaseStep.BEGIN_COMBAT, playerB, "Turn to Frog", "Thragtusk"); + + castSpell(1, PhaseStep.DECLARE_ATTACKERS, playerB, "Turn to Frog", "Thragtusk"); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Public Execution", "Thragtusk"); setStopAt(1, PhaseStep.END_TURN); execute(); + assertGraveyardCount(playerB,"Tortoise Formation", 1); assertGraveyardCount(playerB,"Turn to Frog", 1); assertPermanentCount(playerB, "Thragtusk", 1); @@ -118,5 +123,5 @@ public class ThragtuskTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Beast", 0); } - + } \ No newline at end of file diff --git a/Mage/src/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/mage/abilities/TriggeredAbilityImpl.java index 26806511a63..d38ae09362e 100644 --- a/Mage/src/mage/abilities/TriggeredAbilityImpl.java +++ b/Mage/src/mage/abilities/TriggeredAbilityImpl.java @@ -38,7 +38,6 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.players.Player; -import org.apache.log4j.Logger; /** * @@ -46,8 +45,6 @@ import org.apache.log4j.Logger; */ public abstract class TriggeredAbilityImpl extends AbilityImpl implements TriggeredAbility { - private static final transient Logger logger = Logger.getLogger(TriggeredAbilityImpl.class); - protected boolean optional; public TriggeredAbilityImpl(Zone zone, Effect effect) { @@ -187,9 +184,6 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge } else { if (((ZoneChangeEvent)event).getTarget() != null) { source = ((ZoneChangeEvent)event).getTarget(); - if (source.getName().equals("Thragtusk")) { - logger.info(source.getAbilities().toString()); - } } else { source = game.getLastKnownInformation(getSourceId(), ((ZoneChangeEvent)event).getZone()); }