github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1771 from drmDev/master

Browse source 
FlamebladeAngel bug fix and tests
This commit is contained in:
Derek M 2016-04-04 10:41:22 -04:00
commit 6e220ab9a9
2 changed files with 104 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/sets/shadowsoverinnistrad/FlamebladeAngel.java
View file

@ -38,7 +38,6 @@ import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamageEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
@ -90,7 +89,9 @@ class FlamebladeAngelTriggeredAbility extends TriggeredAbilityImpl {
@java.lang.Override
public boolean checkEventType(GameEvent event, Game game) {
return event instanceof DamageEvent;
return event.getType() == GameEvent.EventType.DAMAGED_CREATURE
|| event.getType() == GameEvent.EventType.DAMAGED_PLANESWALKER
|| event.getType() == GameEvent.EventType.DAMAGED_PLAYER;
}
@java.lang.Override

101
Mage.Tests/src/test/java/org/mage/test/cards/single/soi/FlamebladeAngelTest.java Normal file
View file

@ -0,0 +1,101 @@
package org.mage.test.cards.single.soi;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
* 4RR
* Creature - Angel
* Flying
*
* Whenever a source an opponent controls deals damage to you or a permanent you control,
* you may have Flameblade Angel deal 1 damage to that source's controller.
*
* @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
*/
public class FlamebladeAngelTest extends CardTestPlayerBase {
/**
* Reported bug: Not triggering when damage is dealt to the creatures I control.
*/
@Test
public void testDamageToCreature() {
addCard(Zone.BATTLEFIELD, playerA, "Flameblade Angel");
addCard(Zone.BATTLEFIELD, playerA, "Wall of Roots"); // 0/5
addCard(Zone.HAND, playerB, "Shock"); // instant deals 2 dmg to creature/player
addCard(Zone.BATTLEFIELD, playerB, "Mountain");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Shock");
addTarget(playerB, "Wall of Roots");
setStopAt(2, PhaseStep.BEGIN_COMBAT);
execute();
Permanent roots = getPermanent("Wall of Roots", playerA);
Assert.assertEquals("Wall of Roots should have 2 damage dealt to it", 2, roots.getDamage());
assertGraveyardCount(playerB, "Shock", 1);
assertLife(playerA, 20);
assertLife(playerB, 19); // Angel should deal 1 damage to Shock's controller
}
/**
* Reported bug: Not triggering when damage is dealt to the creatures I control.
*/
@Test
public void testDamageToMultipleCreatures() {
addCard(Zone.BATTLEFIELD, playerA, "Flameblade Angel");
addCard(Zone.BATTLEFIELD, playerA, "Wall of Roots"); // 0/5
addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears"); // 2/2
addCard(Zone.HAND, playerB, "Shock", 2); // instant deals 2 dmg to creature/player
addCard(Zone.BATTLEFIELD, playerB, "Mountain", 2);
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Shock");
addTarget(playerB, "Wall of Roots");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Shock");
addTarget(playerB, "Grizzly Bears");
setStopAt(2, PhaseStep.BEGIN_COMBAT);
execute();
Permanent roots = getPermanent("Wall of Roots", playerA);
Assert.assertEquals("Wall of Roots should have 2 damage dealt to it", 2, roots.getDamage());
assertGraveyardCount(playerB, "Shock", 2);
assertGraveyardCount(playerA, "Grizzly Bears", 1);
assertLife(playerA, 20);
assertLife(playerB, 18); // Angel should deal 1 damage twice to Shock's controller
}
/**
* Reported bug: Not triggering when damage is dealt to the creatures I control.
*/
@Test
public void testCombatDamageToCreatures() {
addCard(Zone.BATTLEFIELD, playerA, "Flameblade Angel");
addCard(Zone.BATTLEFIELD, playerA, "Wall of Roots"); // 0/5
addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears"); // 2/2
addCard(Zone.BATTLEFIELD, playerB, "Elite Vanguard"); // 2/1
addCard(Zone.BATTLEFIELD, playerB, "Hill Giant"); // 3/3
attack(2, playerB, "Elite Vanguard");
attack(2, playerB, "Hill Giant");
block(2, playerA, "Wall of Roots", "Hill Giant");
block(2, playerA, "Grizzly Bears", "Elite Vanguard");
setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
execute();
Permanent roots = getPermanent("Wall of Roots", playerA);
Assert.assertEquals("Wall of Roots should have 3 damage dealt to it", 3, roots.getDamage());
assertGraveyardCount(playerA, "Grizzly Bears", 1);
assertGraveyardCount(playerB, "Elite Vanguard", 1);
assertLife(playerA, 20);
assertLife(playerB, 18); // Angel should deal 1 damage twice
}
}