From e2734814995ed5b5c859c76158b76e83fb6fd31b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 11 Mar 2015 15:02:52 +0100 Subject: [PATCH] Some minor changes. --- Mage.Sets/src/mage/sets/antiquities/PowerArtifact.java | 3 +-- .../cards/abilities/oneshot/damage/LightningBoltTest.java | 7 +++++++ .../PowerToughnessCalculationAfterCombatDamageTest.java | 6 +++++- .../effects/common/ReturnFromExileForSourceEffect.java | 2 -- .../ReturnFromGraveyardToBattlefieldTargetEffect.java | 1 - 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/sets/antiquities/PowerArtifact.java b/Mage.Sets/src/mage/sets/antiquities/PowerArtifact.java index e4791acea25..64ac7fd00bf 100644 --- a/Mage.Sets/src/mage/sets/antiquities/PowerArtifact.java +++ b/Mage.Sets/src/mage/sets/antiquities/PowerArtifact.java @@ -8,13 +8,12 @@ package mage.sets.antiquities; import java.util.UUID; import mage.Mana; import mage.abilities.Ability; -import mage.abilities.ActivatedAbility; -import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; +import mage.constants.AbilityType; import mage.constants.CardType; import mage.constants.CostModificationType; import mage.constants.Duration; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java index 85c4f6a9610..a698664c363 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java @@ -84,7 +84,10 @@ public class LightningBoltTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Lightning Bolt"); addCard(Zone.GRAVEYARD, playerB, "Forest"); + // Destroy target creature with defender. addCard(Zone.GRAVEYARD, playerB, "Clear a Path"); + // Tarmogoyf's power is equal to the number of card types among cards in all graveyards and its toughness is equal to that number plus 1. + // (Artifact, creature, enchantment, instant, land, planeswalker, sorcery, and tribal are card types.) addCard(Zone.BATTLEFIELD, playerB, "Tarmogoyf"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Tarmogoyf"); @@ -93,6 +96,10 @@ public class LightningBoltTest extends CardTestPlayerBase { execute(); // Tarmogoyf is a 2/3 that then takes 3 damage, then becomes a 3/4 as the // Lightning Bolt is put into the graveyard and then state base actions are checked and Tarmogoyf survives. + // First, the Tarmogoyf will receive the damage, then Lightning Bolt goes to the graveyard. + // Then the active player would receive priority - which means, that right before that happens, state-based + // effects are checked: the game sees a 3/4 creature will 3 damage on it, so nothing happens. + // Then the active player receives priority. assertPermanentCount(playerB, "Tarmogoyf", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/PowerToughnessCalculationAfterCombatDamageTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/PowerToughnessCalculationAfterCombatDamageTest.java index 3856aa46657..1cc51349f1d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/PowerToughnessCalculationAfterCombatDamageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/PowerToughnessCalculationAfterCombatDamageTest.java @@ -14,13 +14,17 @@ import org.mage.test.serverside.base.CardTestPlayerBase; /** * Test that calculated p/t is applied after combat damage resolution, so a 2/2 Nighthowler * dies if blocked from a 2/2 creature. - * + * All combat damage happens simultaneously. Then any abilities that trigger from combat + * damage go on the stack. In normal circumstances, the combo you're trying to construct doesn't work. * @author LevelX2 */ public class PowerToughnessCalculationAfterCombatDamageTest extends CardTestPlayerBase { @Test public void powerToughnessCalculation() { + // Pain Seer Creature - Human Wizard 2/2 + // Inspired - Whenever Pain Seer becomes untapped, reveal the top card of your library and put that card + // into your hand. You lose life equal to that card's converted mana cost. addCard(Zone.BATTLEFIELD, playerA, "Pain Seer"); addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion"); // Nighthowler and enchanted creature each get +X/+X, where X is the number of creature cards in all graveyards. diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java b/Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java index 26ffd2715b2..9b452d94fef 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java @@ -32,10 +32,8 @@ import java.util.LinkedList; import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; -import mage.constants.AbilityType; import mage.constants.Outcome; import mage.constants.Zone; import static mage.constants.Zone.BATTLEFIELD; diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java b/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java index 94c38d3ecae..f1d52b31f80 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java @@ -36,7 +36,6 @@ import mage.cards.Card; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; -import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; import mage.util.CardUtil;