From a5f46b88162e79b515e6144135493459b96b42c1 Mon Sep 17 00:00:00 2001 From: Ingmar Goudt Date: Wed, 16 Jan 2019 13:33:44 +0100 Subject: [PATCH] Urborg Syphon Mage makes opponents lose life, rather than damaging them --- .../src/mage/cards/u/UrborgSyphonMage.java | 2 +- .../abilities/abilitywords/RevoltTest.java | 112 +++++++++--------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java b/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java index 94145a9ebec..4fdda746f26 100644 --- a/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java +++ b/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java @@ -70,7 +70,7 @@ class UrborgSyphonMageEffect extends OneShotEffect { if (!Objects.equals(playerId, source.getControllerId())) { Player player = game.getPlayer(playerId); if (player != null) { - damage += player.damage(2, source.getSourceId(), game, false, true); + damage += player.loseLife(2, game, false); } } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/RevoltTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/RevoltTest.java index b5e1ca8afd4..c25d6cad2d8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/RevoltTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/RevoltTest.java @@ -1,56 +1,56 @@ - -package org.mage.test.cards.abilities.abilitywords; - -import mage.constants.PhaseStep; -import mage.constants.Zone; -import org.junit.Test; -import org.mage.test.serverside.base.CardTestPlayerBase; - -/** - * - * @author LevelX2 - */ -public class RevoltTest extends CardTestPlayerBase { - - /** - * In a duel commander match, I played a turn 1 Narnam Renegade off a basic - * forest, and it entered the battlefield with a +1/+1 counter (it shouldn't - * have). - */ - @Test - public void testFalseCondition() { - // Deathtouch - // Revolt — Narnam Renegade enters the battlefield with a +1/+1 counter on it if a permanent you controlled left this battlefield this turn. - addCard(Zone.HAND, playerA, "Narnam Renegade", 1); // Creature 1/2 {G} - addCard(Zone.HAND, playerA, "Forest", 1); - - playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Narnam Renegade"); - - setStopAt(1, PhaseStep.BEGIN_COMBAT); - execute(); - - assertPowerToughness(playerA, "Narnam Renegade", 1, 2); - } - - @Test - public void testTrueCondition() { - // Deathtouch - // Revolt — Narnam Renegade enters the battlefield with a +1/+1 counter on it if a permanent you controlled left this battlefield this turn. - addCard(Zone.HAND, playerA, "Narnam Renegade", 1); // Creature 1/2 {G} - // {T}, Sacrifice Terramorphic Expanse: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library. - addCard(Zone.BATTLEFIELD, playerA, "Terramorphic Expanse", 1); - addCard(Zone.HAND, playerA, "Forest", 1); - - playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest"); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}, Sacrifice"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Narnam Renegade"); - - setStopAt(1, PhaseStep.BEGIN_COMBAT); - execute(); - - assertGraveyardCount(playerA, "Terramorphic Expanse", 1); - assertPowerToughness(playerA, "Narnam Renegade", 2, 3); - } - -} + +package org.mage.test.cards.abilities.abilitywords; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ +public class RevoltTest extends CardTestPlayerBase { + + /** + * In a duel commander match, I played a turn 1 Narnam Renegade off a basic + * forest, and it entered the battlefield with a +1/+1 counter (it shouldn't + * have). + */ + @Test + public void testFalseCondition() { + // Deathtouch + // Revolt — Narnam Renegade enters the battlefield with a +1/+1 counter on it if a permanent you controlled left this battlefield this turn. + addCard(Zone.HAND, playerA, "Narnam Renegade", 1); // Creature 1/2 {G} + addCard(Zone.HAND, playerA, "Forest", 1); + + playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Narnam Renegade"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPowerToughness(playerA, "Narnam Renegade", 1, 2); + } + + @Test + public void testTrueCondition() { + // Deathtouch + // Revolt — Narnam Renegade enters the battlefield with a +1/+1 counter on it if a permanent you controlled left this battlefield this turn. + addCard(Zone.HAND, playerA, "Narnam Renegade", 1); // Creature 1/2 {G} + // {T}, Sacrifice Terramorphic Expanse: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library. + addCard(Zone.BATTLEFIELD, playerA, "Terramorphic Expanse", 1); + addCard(Zone.HAND, playerA, "Forest", 1); + + playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}, Sacrifice"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Narnam Renegade"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertGraveyardCount(playerA, "Terramorphic Expanse", 1); + assertPowerToughness(playerA, "Narnam Renegade", 2, 3); + } + +}