Fix Skyfire Phoenix's triggered ability.

This commit is contained in:
dilnu 2020-02-01 19:02:50 -05:00
parent a020326fce
commit d6989d15b9
3 changed files with 104 additions and 1 deletions

View file

@ -64,7 +64,7 @@ class SkyfirePhoenixTriggeredAbility extends SpellCastControllerTriggeredAbility
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
return super.checkTrigger(event, game) && game.getCommandersIds( return super.checkTrigger(event, game) && game.getCommandersIds(
game.getPlayer(getControllerId()), CommanderCardType.COMMANDER_OR_OATHBREAKER game.getPlayer(getControllerId()), CommanderCardType.COMMANDER_OR_OATHBREAKER
).contains(event.getTargetId()); ).contains(event.getSourceId());
} }
@Override @Override

View file

@ -0,0 +1,71 @@
NAME:Partner Commanders
1 [THS:58] Ordeal of Thassa
1 [5ED:388] Mana Vault
1 [THS:14] Gift of Immortality
1 [PC2:12] Spirit Mantle
1 [M13:36] Sublime Archangel
1 [M13:206] Gilded Lotus
1 [M11:5] Armored Ascension
1 [ALA:27] Sigiled Paladin
1 [ALA:26] Sighted-Caste Sorcerer
1 [CON:2] Asha's Favor
1 [M14:210] Fireshrieker
1 [GTC:17] Holy Mantle
1 [CHK:65] Hinder
1 [DGM:96] Render Silent
1 [M13:74] Tricks of the Trade
1 [ISD:229] Mask of Avacyn
1 [GPT:28] Infiltrator's Magemark
14 [THS:234] Island
1 [CMD:261] Sol Ring
1 [THS:25] Ordeal of Heliod
1 [5DN:131] Helm of Kaldra
1 [M12:24] Lifelink
1 [AVR:50] Elgaud Shieldmate
19 [THS:230] Plains
1 [M14:23] Indestructibility
1 [M14:5] Archangel of Thune
1 [CMD:265] Azorius Chancery
1 [ARB:3] Ethercaste Knight
1 [ARB:1] Ardent Plea
1 [M13:18] Guardians of Akrasa
1 [CMD:40] Brainstorm
1 [UDS:139] Thran Dynamo
1 [M12:219] Swiftfoot Boots
1 [THS:39] Aqueous Form
1 [M13:6] Aven Squire
1 [MMA:25] Path to Exile
1 [M13:4] Angelic Benediction
1 [CMD:253] Lightning Greaves
1 [SHM:150] Steel of the Godhead
1 [M13:225] Glacial Fortress
1 [10E:40] Serra's Embrace
1 [JUD:31] Unquestioned Authority
1 [M13:221] Cathedral of War
1 [RTR:9] Ethereal Armor
1 [DDL:27] Battle Mastery
1 [DDL:24] Bonds of Faith
1 [ISD:53] Dissipate
1 [DKA:148] Executioner's Hood
1 [DIS:159] Azorius Signet
1 [GTC:37] Hands of Binding
1 [PC2:112] Quietus Spike
1 [MRD:144] Banshee's Blade
1 [AVR:36] Silverblade Paladin
1 [PC2:115] Whispersilk Cloak
1 [M12:73] Ponder
1 [M13:29] Rhox Faithmender
1 [ALA:1] Akrasan Squire
1 [M13:213] Ring of Thune
1 [UDS:46] Sigil of Sleep
1 [M13:211] Ring of Evos Isle
1 [RTR:241] Hallowed Fountain
1 [7ED:67] Counterspell
1 [ISD:49] Curiosity
1 [SOM:229] Seachrome Coast
1 [PC2:10] Mammoth Umbra
1 [MBS:104] Darksteel Plate
1 [M13:21] Knight of Glory
1 [M13:22] Oblivion Ring
SB: 1 [C16:33] Ishai, Ojutai Dragonspeaker
SB: 1 [C16:46] Thrasios, Triton Hero

View file

@ -0,0 +1,32 @@
package org.mage.test.commander.duel;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.GameException;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestCommanderDuelBase;
import java.io.FileNotFoundException;
public class TestPartnerCommanders extends CardTestCommanderDuelBase {
@Override
protected Game createNewGameAndPlayers() throws GameException, FileNotFoundException {
setDecknamePlayerA("CommanderDuel_Partners.dck"); // Commander = Ishai, Ojutai Dragonspeaker and Thrasios, Triton Hero
return super.createNewGameAndPlayers();
}
@Test
public void testSkyfirePhoenix() {
addCard(Zone.GRAVEYARD, playerA, "Skyfire Phoenix");
addCard(Zone.BATTLEFIELD, playerA, "Tropical Island", 4);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Thrasios, Triton Hero");
setStopAt(1, PhaseStep.END_TURN);
execute();
assertPermanentCount(playerA, "Thrasios, Triton Hero", 1);
assertPermanentCount(playerA, "Skyfire Phoenix", 1);
}
}