github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

Some minor changes.

Browse source
This commit is contained in:
LevelX2 2015-03-11 15:02:52 +01:00
parent 3f0a235471
commit e273481499
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/sets/antiquities/PowerArtifact.java
View file

@ -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;

7
Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java
View file

@ -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);
}

6
Mage.Tests/src/test/java/org/mage/test/combat/PowerToughnessCalculationAfterCombatDamageTest.java
View file

@ -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.

2
Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java
View file

@ -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;

1
Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java
View file

@ -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;